[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 1a313bad72 -s ours am skip reason: subject contains skip directive Change-Id: Ief0413c26b6ad365f7c74ab2fcdfde443e8ec1b0